Merge from emacs-24; up to r111320
authorGlenn Morris <rgm@gnu.org>
Tue, 5 Mar 2013 03:59:35 +0000 (19:59 -0800)
committerGlenn Morris <rgm@gnu.org>
Tue, 5 Mar 2013 03:59:35 +0000 (19:59 -0800)
commit2a5de61c971191ae0a211a1b98b609501a19b259
tree5f2ae6d409b1839d892cf047b8389e5fa567793a
parent100dd8ff781cb326fcdf4e4978ff11289fa5ee61
parent1de13a309ee1d4b7bcf8193f2e454627bf7d93b2
Merge from emacs-24; up to r111320
ChangeLog
Makefile.in
doc/lispintro/ChangeLog
doc/lispintro/emacs-lisp-intro.texi
src/ChangeLog
src/sysdep.c